Merge from emacs-24; up to r111274
authorGlenn Morris <rgm@gnu.org>
Sun, 17 Feb 2013 19:01:46 +0000 (11:01 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 17 Feb 2013 19:01:46 +0000 (11:01 -0800)
commitbb0ae489194c438e2e6bfde4412cb4e716d9543b
tree0fbc6ab99107b380e26494d5297ce546e64309ae
parent3885cfcaa8293ce29760022faeab6a8213a87827
parent8ad69703d80722f89899d204ac986a4eecfb9ca9
Merge from emacs-24; up to r111274
etc/TODO
lisp/ChangeLog
src/ChangeLog
src/xdisp.c